From ea8ffe42aab3063c83dd4fe28b5d45b84f889ac3 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 4 Feb 2008 23:01:00 +0000 Subject: [PATCH] g_return_if_fail() is the cell is not part of the combo instead of 2008-02-04 Michael Natterer * gtk/gtkcombobox.c (gtk_combo_box_cell_layout_add_attribute): g_return_if_fail() is the cell is not part of the combo instead of crashing in the next line. svn path=/trunk/; revision=19462 --- ChangeLog | 6 ++++++ gtk/gtkcombobox.c | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index e7d1d08334..00fca272a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-04 Michael Natterer + + * gtk/gtkcombobox.c (gtk_combo_box_cell_layout_add_attribute): + g_return_if_fail() is the cell is not part of the combo instead of + crashing in the next line. + 2008-02-01 Cody Russell * modules/engines/ms-windows/xp_theme.[ch] diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 7021e71601..c1f9156041 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -4264,6 +4264,7 @@ gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout, combo_box = GTK_COMBO_BOX (layout); info = gtk_combo_box_get_cell_info (combo_box, cell); + g_return_if_fail (info != NULL); info->attributes = g_slist_prepend (info->attributes, GINT_TO_POINTER (column)); -- 2.30.2